Make BuiltinType#dress robust to null and undefined.
Fix RelationType#include.
Merge branch 'master' into test_system