Sync'd branch projects/ash with upstream @ Tue Sep 30 07:29:54 PDT 2014