Sync'd branch projects/elm with upstream @ Mon Oct 27 18:35:10 PDT 2014