Merge branch 'devel' Conflicts: CHANGES
Merge branch 'devel'
Releasing version 1.3100
Releasing 1.3099
Releasing 1.3098
Releasing 1.3097