combine tsl mask
Merge branch 'master' of github.com:florianziemen/bin

Conflicts:
	combine_tsl_mask