Merge branch 'master' into develop
Merge branch 'master' into develop
Merge remote-tracking branch 'origin' into develop
Version 3.0.0
Passes tests.
Bumped version to 3.0.0
Merge branch 'release-3.0.0'