Should compile wpf on appveyor
Merge branch 'master' into isop_server