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