Merged changes in main trunk up to 2.0.6 (see CHANGELOG)