Applied patch ACT-2057
Merge branch 'master' of https://github.com/Activiti/Activiti