Sync'd branch projects/ash with upstream @ Thu Nov 13 06:56:00 PST 2014