Switched from short object names to the long one.
Merge branch 'master' of git.otrs.com:otrs/otrs