Merge branch 'master' into instanttim
Revert "Merge branch 'master' into instanttim"

This reverts commit e33c0e145e72c57db6da47d5a8d7be77986f6228, reversing
changes made to a01550ef345af29c4a112b9f8beaebb6921dbbfb.
Merge branch 'instanttim' of https://github.com/jepefe/monitormate into instanttim