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