Merge branch 'master' into improved-logging