Forwarded PR: cockpit #6

Closed
adamm wants to merge 1 commits from PR_cockpit#5 into master

Submodule cockpit updated: 95f291257b...cb83e616ae