Merge branch 'release-0.8.7' 0.8.7
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 25 Sep 2013 17:28:02 +0000 (19:28 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 25 Sep 2013 17:28:02 +0000 (19:28 +0200)

Trivial merge