[seam-commits] [seam/forge] 808d1f: merged from mike