More fixes after JS
Merge branch 'master' of https://github.com/enso-lang/enso

Conflicts:
	src/core/system/load/load.rb
Merge branch 'master' of https://github.com/enso-lang/enso

Conflicts:
	src/core/expr/code/eval.rb
Merge branch 'master' of https://github.com/enso-lang/enso

Conflicts:
	src/core/expr/code/impl.rb