Merge branch 'master' of gitlab.science.ru.nl:mlubbers/mTask
authorMart Lubbers <mart@martlubbers.net>
Mon, 3 Apr 2017 08:25:59 +0000 (10:25 +0200)
committerMart Lubbers <mart@martlubbers.net>
Mon, 3 Apr 2017 08:25:59 +0000 (10:25 +0200)

Trivial merge