Sync'd branch projects/larch with upstream @ Thu Aug 28 03:46:05 PDT 2014