Merge branch 'master' into graphics
tree1d8381473784e59501c2bb2760213c997fcfe376
drwxr-xr-x - RiDMC