Merge branch 'hs/taintwarn'