Merge branch 'hotfix/1.3.5'
Merge branch 'master' into develop
Merge branch 'develop' of github.com:jplusplus/detective.io into develop