Update code so that it can be included in releases.
Merge branch 'release' into develop