Change submodules to https since github does not like http anymore
Merge branch 'hotfix/3.3.1.1' into 3.3/master