Fix for JGraph bug
Merge branch 'develop': 1.16.4 (hotfix)