Shut-up useless aliasing warning.
Merge branch 'master' into parameter-safe-strings