This somehow seems to have fixed the problem
Merge branch 'master' into stable