Merge pull request #1189 from jwillemsen/jwi-removememchremulation