Sync'd branch projects/ash with upstream @ Thu Oct 30 23:24:56 PDT 2014