Sync'd branch projects/larch with upstream @ Thu Sep 11 03:13:10 PDT 2014