Collapse develop back in to master in preparation for v1.1.0 release.