Minor update.
Merge branch 'next' into public_key
Windows compile fix