Small refactoring
Merge branch 'develop' of https://github.com/Catel/Catel into develop