Merge develop into master.

Tests on develop are passing.
Merge branch 'master' into develop