merge from activiti-extra