Sync'd branch projects/larch with upstream @ Tue Sep  9 05:47:09 PDT 2014