Sync'd branch projects/ash with upstream @ Tue Oct 14 22:06:57 PDT 2014