Merge branch 'master' into swrenderer
Merge branch 'swrenderer' of https://github.com/yvt/openspades into swrenderer