xaml fixes
Merge branch 'master' of https://github.com/signumsoftware/extensions
Merge remote-tracking branch 'origin/master'