Merging changes into the 1.5 branch

git-svn-id: https://plugins.svn.wordpress.org/wordpoints/branches/1.5@956953 b8457f37-d9ea-0310-8a92-e5e31aec5664