Merge remote-tracking branch 'github/pull/824'
authorMatt Turner <mattst88@gentoo.org>
Tue, 9 Feb 2016 20:29:19 +0000 (12:29 -0800)
committerMatt Turner <mattst88@gentoo.org>
Tue, 9 Feb 2016 20:29:19 +0000 (12:29 -0800)

Trivial merge