New tags
Merge branch 'master' into websockets

Conflicts:
	.gitignore