Merge remote branch 'origin/w64' into devel