Merge remote-tracking branch 'origin/sourcecodegeneration#2' into WisienkasUmlet_master