Sync'd branch projects/ash with upstream @ Wed Sep 24 07:48:54 PDT 2014