Merge branch 'master' into dev
changes by Ludwik, according to CssChrome_007... test failing manually
Merge branch 'preview'