Merge branch 'hotfix/msfpath' into develop
Fix #293: "addinfourl instance has no attribute id"
Merge branch 'develop'