Add the ability to load dax files specified by the user.
Merge branch 'master' into storm4