fix swift generator bugs
Merge branch 'develop'