Here goes.
Merging develop into master for deployment.