Fix merge error.

Authored by woltherav on Sep 13 2019, 11:55 AM.