Aaron Ogburn
committed
on 02 Jun 14
[BZ-1101472] merge fix from BZ-1027272