First update
Merge branch 'master' of github.com:Metaswitch/sprout into iss404
Updates after test
Merge pull request #442 from Metaswitch/iss404

[Reviewer: Rob] Iss404