merge fix
Merge branch 'master' of code-ini.com:repositories/stb-gui