Sync'd branch projects/larch with upstream @ Fri Sep  5 06:42:09 PDT 2014