Sync'd branch projects/larch with upstream @ Thu Sep  4 10:32:06 PDT 2014