Fix for ACT-1771
Merge branch 'master' of https://github.com/Activiti/Activiti
Fix for ACT-1741
Merge remote-tracking branch 'upstream/master'