Tom Cunningham
committed
on 19 Sep 13
Merge JBESB-3933 to one-off branch.