Prepared for 2.1 update.
Merge branch 'develop'