Merge branch 'release-6.1.2-a'
Merge branch 'develop' into release-6.1.3
[[ Bug 11385 ]] Make sure plist fields are escaped properly.