bug fix
Merge branch 'master' into feature/namespace_adjust

Conflicts:
	build/tmlib.min.js