Sync'd branch projects/elm with upstream @ Mon Nov  3 19:20:08 PST 2014