Merge commit '68e7ac868c668c8398e8d4e2bb52c17f0f96e48f' into HEAD

Conflicts:
	convert.py