Summary of changes:
ebb39a1... update to 2.0.4 release (*)
a503c1c... use doc macro (*)
96ea699... use kinit requires macro (*)
245ee55... use kinit requires macro (*)
bfbd1d2... revert last commit (*)
(*) This commit already existed in another branch; no separate mail sent