Sync'd branch projects/ash with upstream @ Mon Sep 22 16:23:55 PDT 2014