Miscellaneous cleanups#235

bbannier merged 3 commits into

masterzeek/package-manager:masterfrom

topic/bbannier/cleanupszeek/package-manager:topic/bbannier/cleanupsCopy head branch name to clipboard