Merge remote-tracking branch 'github/pr/260'
authorJason Zaman <perfinion@gentoo.org>
Tue, 27 Oct 2015 12:18:33 +0000 (20:18 +0800)
committerJason Zaman <perfinion@gentoo.org>
Tue, 27 Oct 2015 12:20:04 +0000 (20:20 +0800)

Trivial merge