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