Fixed nullref exception in TypeMappingFilterBase
Merge branch 'development' of github.com:okb/Pomona into development