Merged into master for release 2.0