Merge CI blocks together
Merge branch 'master' of https://github.com/ArnaudD/timendash
Merge pull request https://github.com/mru2/timendash/pull/4
Merge pull request #5 from popox/master

Merge CI blocks together