Sync'd branch projects/ash with upstream @ Mon Sep 15 11:59:04 PDT 2014