Merge branch 'develop' into beta

I think nightly merges are reasonable, depending on the number of
changes that day, of course.