Bringing in version 2.6.0

git-svn-id: https://plugins.svn.wordpress.org/simple-links/trunk@964656 b8457f37-d9ea-0310-8a92-e5e31aec5664