Merge pull request #815 from simondeziel/modules-8081