Merge pull request #592 from htrex/master

Fix for CSS Output regression
Output test moved into framework code. Save resources.  ;)
Merge remote-tracking branch 'upstream/master'