Update 3.1

No big changes, nothing to upload