Merge tag 'v3.12.13' into 3.12/master

This is the 3.12.13 stable release

Conflicts:
	Makefile
4200_fbcondecor-0.9.6.patch

Update to newest fbcondecor from gentoo
Merge branch '3.12/fbcondecor' into 3.12/master
Zen 3.12.x merged