Merge branch 'dev'
partial fix for https://github.com/GsDevKit/zinc/issues/43
 (for 2.4.x)