code cleanup
Merge branch 'master' into pkg-release-windows