Merge develop in master for release v2.0.