Merged master into dt-0.9.4

Take a look at pom.xml to ensure I did this correctly.