Merge branch 'master' into dagrt-fusion