Backport fix from e5df3ded85c94f0a33afe12b18e6afad96f12639.

Authored by hein on Jul 7 2017, 6:40 AM.