Merge tag 'v175'
Merge remote-tracking branch 'origin/master' into develop

An extra commit was made as part of the v175 release, so bring it back.
This makes sure we can keep merging develop to master in future.