Merge branch 'hotfix/2.0.3'
Merge branch 'master' of github.com:zufrieden/uxlausanne