Sync'd branch projects/ash with upstream @ Tue Sep 23 10:02:54 PDT 2014