Merge branch 'master' into np/dreflog