Add MAKEOPTS="${MAKEOPTS} -j1" to unity-base/gnome-control-center-signon
Merge remote-tracking branch 'shiznix/master'