Sync'd branch projects/ash with upstream @ Fri Oct 31 20:54:55 PDT 2014