Sync'd branch projects/ash with upstream @ Thu Nov 13 07:17:59 PST 2014