Fix merge error.

Authored by woltherav on Oct 7 2018, 12:50 PM.