Merge branch 'feature/fix-coverity-defects' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 20 Jul 2015 17:28:08 +0000 (19:28 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 20 Jul 2015 17:28:08 +0000 (19:28 +0200)

Trivial merge