Working on 3.5, ready for testing.

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