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