Sync'd branch projects/elm with upstream @ Wed Oct  1 17:17:01 PDT 2014