Fixed a bug caused by importing the same name from two different modules without renaming one of them.
Fixed a bug caused by importing the same name from two different modules without renaming one of them.

pankajp/pyface,geggo/pyface,geggo/pyface,brett-patterson/pyface