Merging changes to svn branch

git-svn-id: https://plugins.svn.wordpress.org/trim-widget-descriptions/trunk@843165 b8457f37-d9ea-0310-8a92-e5e31aec5664