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