Sync'd branch projects/ash with upstream @ Mon Oct 20 17:51:56 PDT 2014