Merge remote-tracking branch 'github/pr/473'
authorRobin H. Johnson <robbat2@gentoo.org>
Mon, 14 Dec 2015 21:35:51 +0000 (13:35 -0800)
committerRobin H. Johnson <robbat2@gentoo.org>
Mon, 14 Dec 2015 21:35:51 +0000 (13:35 -0800)

Trivial merge