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