merge from main branch

git-svn-id: https://plugins.svn.wordpress.org/ag-custom-admin/branches/1.2.8@799480 b8457f37-d9ea-0310-8a92-e5e31aec5664