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