Merge tdil branch over to master