Fix merge of dda4d42e891a3.

Authored by hein on Feb 16 2017, 1:20 PM.