next try to fix merge with master

Authored by mqualmann on Feb 24 2018, 4:15 PM.

Description

next try to fix merge with master

Details

Committed
mqualmannFeb 24 2018, 4:15 PM
Parents
R482:00a8401595c7: all these methods can be private
Branches
Unknown
Tags
Unknown