Update Makefile.in, configure, wspr.py
Merge remote-tracking branch 'origin/master'