Merge branch 'feature-wordpress3.9'

git-svn-id: https://plugins.svn.wordpress.org/spacewatch/trunk@906284 b8457f37-d9ea-0310-8a92-e5e31aec5664