Merge remote-tracking branch 'origin/upstream' into upstream
authorSam Hartman <hartmans@debian.org>
Tue, 14 Jul 2015 20:21:24 +0000 (16:21 -0400)
committerSam Hartman <hartmans@debian.org>
Tue, 14 Jul 2015 20:21:24 +0000 (16:21 -0400)

Trivial merge