Fixed a strange fix in WPF.
Merge branch 'master' of https://git.storytec.com/r/Kha