Sync'd branch projects/larch with upstream @ Mon Sep 22 06:15:08 PDT 2014