Merge branch 'testtools' into dt-test
Merge branch 'testr' into dt-test