Production updates from manta
Merge branch 'master' of https://github.com/dan-street/mcpoperating