Merge branch 'develop'
Merge branch 'develop'
Attempt to fix Travis CI scipy build.

Try suggestions in Travis CI issuei 2638.
Merge branch 'develop'
Merge branch 'master' into develop

Doh. Shouldn't have made Travis CI changes directly on master.