Version 4.13 maintenance release
Merge branch 'develop'