Fixed incompatibility with tm 6.0
Merge remote-tracking branch 'upstream/master'