Sync'd branch projects/larch with upstream @ Wed Aug 27 02:43:06 PDT 2014