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