Marek Novotny
committed
on 29 Mar 12
back port of JBSEAM-4916