Merge branch 'develop' into master for release-20130513