Forwarded PR: cockpit #20

Closed
adamm wants to merge 2 commits from PR_cockpit#11 into master

@ -1 +1 @@
Subproject commit ba3323415857354d7a3517f77ac133fcd740ab3611acf123400d5cd9900a70f8
Subproject commit de4b8becd9c83bea352cf5f0f707807082e022a1e5473186a39cb1c5d58e2013