try to avoid inconsistent objects
Merge branch 'appkit_5.1' of git@github.com:xwic/appkit.git into appkit_5.1