diirt: Adding support module
datasource-test: using timeout with tests
Merge remote-tracking branch 'fork/master'