Merge branch 'STABLE-BRANCH-3-1'
This is currently a mix between Gpg4win 3 and 4 builds which will be made explicity by selecting different packages.