Merge branch 'nmu'
authorDarshaka Pathirana <dpat@syn-net.org>
Mon, 28 Jan 2019 15:37:03 +0000 (16:37 +0100)
committerDarshaka Pathirana <dpat@syn-net.org>
Mon, 28 Jan 2019 15:37:03 +0000 (16:37 +0100)

Trivial merge