“Quick” fix to REPL breakage.
Merge remote-tracking branch 'upstream/master' into ready/repl-hotfix
Merge pull request #296 from sellout/ready/repl-hotfix

“Quick” fix to REPL breakage.