Merge tag 'upstream/0.3.7'
authorDarshaka Pathirana <dpat@syn-net.org>
Sun, 10 Jun 2018 05:36:11 +0000 (07:36 +0200)
committerDarshaka Pathirana <dpat@syn-net.org>
Sun, 10 Jun 2018 05:36:11 +0000 (07:36 +0200)
Upstream version 0.3.7


Trivial merge