Sync'd branch projects/larch with upstream @ Mon Sep 29 09:29:08 PDT 2014