Sync'd branch projects/alder with upstream @ Mon Oct 27 11:35:52 PDT 2014