Added patch provided by conradi via the Activiti forum
Merge remote-tracking branch 'remote/master'