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