SWIG Fix.
Merge branch 'cleanupgraphicinterface' into dev