Sync'd branch projects/alder with upstream @ Thu Oct 16 19:56:50 PDT 2014