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