Merge branch 'master' into develop

Doh. Shouldn't have made Travis CI changes directly on master.
Reinstate test coverage as part of CI.

I had deleted the script which actually ran the tests.
Merge branch 'develop'