Merge branch 'dax-contour' of github.com:robertmaynard/matviz into robertmaynard-dax-contour
Merge branch 'robertmaynard-dax-contour'
Ensure we link to QtMain on Windows
Merge branch 'windows'