Sync'd branch projects/elm with upstream @ Mon Oct 13 15:34:04 PDT 2014