Merge branch 'master' into tmarble-trng