Merge master into pre2.1.0.

A promised elsewhere provide a pull request with the merge. 

I was able to check the compilation only on ALSA and jACK. Configure insists to use ALSA when I want to compile it with MingW-W64 on Linux.

@garyscavone Feel free to discuss issues if I misunderstood you.