commit 8023d694d79b1a6af55e1e48a2094c690cebb9e2
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Sun Jul 30 12:10:54 2017 -0600

merged from funtoo-staging

merged:

funtoo-staging: f8cf35fa6ce4f9e0d2658fa7dd56a711f9a9f2b8