Merge pull request #686 from SneakyDave/develop

Typo in "Watermarking Preferences".
Configuration parameter is "wm_paddiing".