Sync'd branch projects/ash with upstream @ Thu Sep 18 17:12:54 PDT 2014