Trunk update for v. 2.1.1.

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