Aaron Ogburn
committed
on 03 Mar 17
[BZ-1429017] merge fix