Pushing 3.4 -fixes lots of weird things, including TARDIS problems.

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