Disable broken test
Merge branch 'master' into janjelle