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