Sync'd branch projects/ash with upstream @ Sun Nov  9 16:45:00 PST 2014