Merge branch 'master' into py2

Conflicts:
	danmaku2ass.py
	test/test-3drot.py