Sync'd branch projects/ash with upstream @ Mon Sep 29 15:50:56 PDT 2014