Tested to 3.6

git-svn-id: https://plugins.svn.wordpress.org/white-label-cms/trunk@759745 b8457f37-d9ea-0310-8a92-e5e31aec5664