Aaron Ogburn
committed
on 24 Feb 17
[BZ-1426611] merge fix