Footerfix
Merge branch 'test-sjaan' into test-rick