Merge branch 'master' of gitlab.science.ru.nl:mlubbers/mTask
authorMart Lubbers <mart@martlubbers.net>
Thu, 22 Jun 2017 09:30:52 +0000 (11:30 +0200)
committerMart Lubbers <mart@martlubbers.net>
Thu, 22 Jun 2017 09:30:52 +0000 (11:30 +0200)

Trivial merge