Issue #2241815 by ryan.armstrong: Missed some merge conflicts.
Fixed minor indentation 'issue'.