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