4.0.2 release
escape query in error message
Merge branch 'MAINT_4_0_2-security' into QA_4_0
Changelog entry for Javascript execution vulnerability PMASA-2013-6
Translated using Weblate (Bengali)

Currently translated at 20.3% (529 of 2602)
Translated using Weblate (English (United Kingdom))

Currently translated at 100.0% (2602 of 2602)
Translated using Weblate (German)

Currently translated at 99.8% (2597 of 2602)
Translated using Weblate (Korean)

Currently translated at 65.9% (1716 of 2602)
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
Merge commit '3311c6f'

Conflicts:
	view_create.php
Merge remote branch 'origin/QA_4_0'