Merge tag 'upstream/0.3.7'
authorDarshaka Pathirana <dpat@syn-net.org>
Sun, 22 Jul 2018 12:52:05 +0000 (14:52 +0200)
committerDarshaka Pathirana <dpat@syn-net.org>
Sun, 22 Jul 2018 12:52:05 +0000 (14:52 +0200)
Upstream version 0.3.7


Trivial merge