Fix forgotten 'untap' command
Merge branch 'master' into linux