Packaging fixes for 0.11.1
For review and discussion - depends on !7 (closed) and !8 (closed) but this merge request is the actual real contribution.
For review and discussion - depends on !7 (closed) and !8 (closed) but this merge request is the actual real contribution.