Fix configure handling for CLN (should fix win32 nightly builds)
Merge branch '1.3.x'