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

Trivial merge