Merge branch 'refs/heads/master' into jan
better shader
Merge branch 'refs/heads/jan'