Aaron Ogburn
committed
on 15 Sep 17
[BZ-1491857] merge fix