Merge branches 'develop' and 'develop' of git@github.com:moxar/jackmarshall into develop
Bugfix due to a non required connexion.