commit 3125e706a7baaed16c28226342866df56afc1edf
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Sun Apr 30 00:11:34 2017 -0600

merged from funtoo-staging

merged:

funtoo-staging: e137fbe05d07148f288e0c3233dd48294926b33d

commit 0d759fc238ac227e2063815e6a33cb31e35735c2
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Mon Apr 3 12:11:36 2017 -0600

merged from funtoo-staging

merged:

funtoo-staging: 7be6fa6864274376b414bf30a6e618d2c353d550