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