Revised handling of pictures to improve consistency.
Merge remote-tracking branch 'origin/master'