Merge pull request #423 from jonohart/master

Fixes for REANNZ deployment issues