fix act-1589
fix ACT-1589
finalize act-1589
merged
Merge branch 'origin/act-1589' of https://github.com/smirzai/Activiti
Applying Saeid's fix