Merge remote-tracking branch 'remotes/Coacher/mccabe-fixes'
authorIan Delaney <idella4@gentoo.org>
Sat, 20 Feb 2016 02:21:30 +0000 (10:21 +0800)
committerIan Delaney <idella4@gentoo.org>
Sat, 20 Feb 2016 02:29:36 +0000 (10:29 +0800)
Pull request: https://github.com/gentoo/gentoo/pull/886


Trivial merge