Version 3.6.1

Merge the `development-3.6` branch separately into master, to avoid other changes which might have been made in `development`.