Merge remote-tracking branch 'github/pr/1633', bug 527306 by Ettore Di Giacinto
authorPacho Ramos <pacho@gentoo.org>
Tue, 26 Jul 2016 18:52:40 +0000 (20:52 +0200)
committerPacho Ramos <pacho@gentoo.org>
Tue, 26 Jul 2016 18:52:40 +0000 (20:52 +0200)

Trivial merge