Sync'd branch projects/ash with upstream @ Wed Sep 17 14:16:01 PDT 2014