Merge branch 'devel' into 'master'

Merge devel <-> master

See merge request oliver/ivatar!151