Merge branch 'tmaster' into future