Fix for issue #216
Merge branch 'refs/heads/master' into reveal-fixes
Merge pull request #219 from ministryofjustice/reveal-fixes

Reveal fixes