merge 1.0.0 into svn

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