Hopefully revert the revert...
Merge pull request #229 from unikent/fix-all-the-merges

Hopefully revert the revert...