Convert to float in case 'wait' was passed in as a string.
Changelog re #791
Merge branch '1.5'

Conflicts:
	docs/changelog.rst