#bugfix-r2 fixed issues with user mapping
Merge branch 'bugfix-r2' into develop
Merge branch 'develop' of github.com:rreimi/jynx into develop