Merge master into pre2.1.0.

As proposed elsewhere the merge request of the master branch. It compiles for ALSA+Jack.
The configure script insists in compiling for ALSA even when I configure using Mingw64 passing --with-winmm.