Imported Upstream version 1.0.4f
Merge tag 'upstream/1.0.4f'

Upstream version 1.0.4f
Fixed watch file.
Updated changelog for new upstream release.