Rebase develop on master

Ensure new binaries are available on master.