--
Merge https://github.com/epaull/TieDIE into devel

Conflicts:
	lib/permute.py