Sync'd branch projects/ash with upstream @ Mon Sep 22 13:15:03 PDT 2014