Fix ambiguous relation errors with nil inverses.

[ fix #3465 ]
Use latest origin: 2.1.0