code for 1.7.1

git-svn-id: https://plugins.svn.wordpress.org/titan-framework/trunk@1042656 b8457f37-d9ea-0310-8a92-e5e31aec5664