Sync'd branch projects/elm with upstream @ Mon Oct  6 15:20:05 PDT 2014