Update trunk. Bug fixes.

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