Sync'd branch projects/ash with upstream @ Tue Aug 26 12:47:53 PDT 2014