Update to TFF 1.6
Minor fix
Minor fix
Merge branch 'feature-clipping' into develop

Conflicts:
	canossa/iframe.py
	canossa/popup.py