Sync'd branch projects/ash with upstream @ Fri Sep 26 09:52:35 PDT 2014