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