Sync'd branch projects/larch with upstream @ Tue Aug 26 07:25:08 PDT 2014