Merge commit '9992f80e42b41e87f315f8c780735bcee46d562f' into running
Merge branch 'running' of github.com:pmatis/misterhouse into running