Merge branch 't0uYK8Ne/catharsis' into 'master'
authorMirio <opivy@hotmail.de>
Fri, 17 Mar 2017 22:44:48 +0000 (22:44 +0000)
committerMirio <opivy@hotmail.de>
Fri, 17 Mar 2017 22:44:48 +0000 (22:44 +0000)
catharsis: fix various issues

See merge request !88


Trivial merge