merged into master for version 3.3