Sync'd branch projects/ash with upstream @ Sat Nov  1 14:32:54 PDT 2014