Updated for mcollective 2.4.1