Sync'd branch projects/ash with upstream @ Tue Sep 30 13:50:55 PDT 2014