Merge branch 'directors-comparison-operators'

* directors-comparison-operators:
  Use %rename
  Fix wrapping of virtual comparison operators with directors