Several changes (see CHANGELOG)