Sync'd branch projects/ash with upstream @ Sat Oct  4 14:35:55 PDT 2014