Missing merge from develop into master.

Needs to be applied before #257.