Forwarded PR: cockpit-repos #66

Closed
autogits-devel wants to merge 2 commits from PR_cockpit-repos#12 into master