Sync'd branch projects/larch with upstream @ Wed Aug 27 16:15:08 PDT 2014