Tihomir Surdilovic
committed
on 14 Jan 11
BRMS-535: Fix for BRMS-532 and BRMS-533