Sync'd branch projects/elm with upstream @ Wed Oct  8 15:51:08 PDT 2014