Sync'd branch projects/ash with upstream @ Sat Oct  4 11:48:54 PDT 2014