Merge branch 'master' into jensen-renyi