Develop

merging latest changes of 2.0 release from master into develop branch.

There are some old pull requests that should probably be brought up to speed to the changes that were merged to master days before they were submitted, and they'll require merging changes from master so that work is not lost if they are to be merged into the develop branch.