Merged from Alfresco 5.13 branch
Merge branch 'master' of https://github.com/Activiti/Activiti
Merge remote-tracking branch 'upstream/master'