Correct typo.
Merge branch 'master' into wol

Conflicts:
	ftw