[seam-commits] [seam/solder] 591e0b: merged catch codebase with solder