Merge branch 'pull895'
authorJason Zaman <perfinion@gentoo.org>
Fri, 26 Feb 2016 11:57:35 +0000 (19:57 +0800)
committerJason Zaman <perfinion@gentoo.org>
Fri, 26 Feb 2016 11:57:35 +0000 (19:57 +0800)

Trivial merge