Bugfix: XMLRPC problems
Formatting changes
Update dev version
Version bump 3.6.4-rc.1
Version bump 3.6.4
Merge branch 'release/3.6.4'
Merge tag '3.6.4' into develop

3.6.4
Preparation for new development cycle after release 3.6.4