Merged. Previous commits before version bumping

git-svn-id: https://plugins.svn.wordpress.org/sucuri-scanner/trunk@956731 b8457f37-d9ea-0310-8a92-e5e31aec5664