Merge branch 'master' into feature/py3

Conflicts:
	whisper.py