Version bump to v1.0.4
Merge remote-tracking branch 'origin/stable' into pkgr