Merge tag 'upstream/0.3.6'
authorDarshaka Pathirana <dpat@syn-net.org>
Thu, 26 Jan 2017 01:45:45 +0000 (02:45 +0100)
committerDarshaka Pathirana <dpat@syn-net.org>
Thu, 26 Jan 2017 01:45:45 +0000 (02:45 +0100)
Upstream version 0.3.6


Trivial merge