Sync'd branch projects/larch with upstream @ Wed Sep 10 15:34:09 PDT 2014