Pass self.qn.qnname to reverse lookups instead of the qn object
Merge branch 'devel'