Hotfix for imports in GooManager.java
Merge branch 'export_support'