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