Merge squashed from dev
Merge branch 'master' of github.com:feaber/melisa into dev