Pre-merge police.
Merge branch '1.0.4-rc' of https://github.com/lindegroup/autopkgr into 1.0.4-rc