Merging changes from Git for 2.0.4 release

git-svn-id: https://plugins.svn.wordpress.org/content-scheduler/trunk@1052992 b8457f37-d9ea-0310-8a92-e5e31aec5664