Sync'd branch projects/ash with upstream @ Tue Sep 23 16:58:57 PDT 2014