Sync'd branch projects/ash with upstream @ Mon Sep 29 18:17:54 PDT 2014