Merge branch 'ci_fail_when_tests_break'
authorVarac <varac@leap.se>
Mon, 26 Jun 2017 17:52:22 +0000 (19:52 +0200)
committerVarac <varac@leap.se>
Mon, 26 Jun 2017 17:52:22 +0000 (19:52 +0200)

Trivial merge