Prepared for 2.1 update.
Merge branch 'develop'
Merge branch 'master' into release
Updated to 2.1 version.