Merge remote-tracking branch 'github/pr/1591'
authorRobin H. Johnson <robbat2@gentoo.org>
Sat, 4 Jun 2016 19:02:56 +0000 (12:02 -0700)
committerRobin H. Johnson <robbat2@gentoo.org>
Sat, 4 Jun 2016 19:02:56 +0000 (12:02 -0700)

Trivial merge