- Backported changes for WP3.9 to previous code.

git-svn-id: https://plugins.svn.wordpress.org/just-writing/trunk@848874 b8457f37-d9ea-0310-8a92-e5e31aec5664