Sync'd branch projects/ash with upstream @ Thu Oct 16 08:48:57 PDT 2014