Merge develop to master for version 3 release.

See most recent commit for details.