Merge develop to master for version 2 release.

See most recent commit for details.