Last minute fix for bug found while testing 5.13 release (table editor)
Merge branches 'master' and 'master' of github.com:Activiti/Activiti