Fix #2005
Merge branch 'integration' of github.com:symphonycms/symphony-2 into integration