Sync'd branch projects/alder with upstream @ Thu Oct 16 18:09:49 PDT 2014