Fix up to tag in OK
Updates after review
Merge branch 'dev' of github.com:Metaswitch/sprout into to_tags
Merge pull request #594 from Metaswitch/to_tags

[Reviewer: Alex] Fix up to tag in OK