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