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