Removed tmp dir
Merge branch 'master' of https://github.com/jmwmulle/xtreme2
Resolving merge