v 2.0.4 to trunk

git-svn-id: https://plugins.svn.wordpress.org/frontier-post/trunk@815462 b8457f37-d9ea-0310-8a92-e5e31aec5664