Merge branch 'develop' of github.com:jackaudio/jack2 into develop