Getting things ready for prod rollout
Merge remote-tracking branch 'upstream/develop' into develop
Commenting pending monitor for when it is ready
Merge pull request #168 from madflojo/develop

Cleanup