Merge pull request #3563 from lewurm/interpreter