Sync'd branch projects/elm with upstream @ Tue Nov  4 19:00:04 PST 2014