INTERNAL: minor pre-release features.
Merge remote-tracking branch 'origin/master'
INTERNAL: minor picture security improvements.
INTERNAL: minor text improvements.