Sync'd branch projects/ash with upstream @ Fri Nov  7 10:44:59 PST 2014