(Hopefully) fix for failing QA test
Merge branch 'master' of https://github.com/Activiti/Activiti