Version 6.1.3 - 6.1.4

This is a hotfix release. All changes originally planned for 6.1.3 will be moved to 6.1.4.

Feedback