Sync'd branch projects/ash with upstream @ Fri Oct  3 07:45:55 PDT 2014