Merge branch 'feature/fix-findbugs-warnings' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 20 Jul 2015 05:03:47 +0000 (07:03 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 20 Jul 2015 05:03:47 +0000 (07:03 +0200)

Trivial merge