refs:30 desc:some fixes 

git-svn-id: https://plugins.svn.wordpress.org/cyberprojekt-image-watermark/branches/sprint_2@946156 b8457f37-d9ea-0310-8a92-e5e31aec5664