Sync'd branch projects/ash with upstream @ Thu Sep 18 22:56:54 PDT 2014