Merge branch 'master' into travis_kernel
does this work?