Merging Git changes for 2.2.5 release

git-svn-id: https://plugins.svn.wordpress.org/syntax-highlighter-mt/trunk@1051211 b8457f37-d9ea-0310-8a92-e5e31aec5664