Sync'd branch projects/ash with upstream @ Wed Oct 22 15:07:45 PDT 2014