Sync'd branch projects/elm with upstream @ Wed Sep 24 20:58:02 PDT 2014