Merge tag 'upstream/1.8.7'
authorBdale Garbee <bdale@gag.com>
Tue, 13 Aug 2013 09:15:25 +0000 (11:15 +0200)
committerBdale Garbee <bdale@gag.com>
Tue, 13 Aug 2013 09:15:25 +0000 (11:15 +0200)
Upstream version 1.8.7


Trivial merge