Merge branch 'hotfix-mergeconflict'

git-svn-id: http://plugins.svn.wordpress.org/aboutimizer/trunk@864436 b8457f37-d9ea-0310-8a92-e5e31aec5664
Merge branch 'feature-wordpress3.9'

git-svn-id: http://plugins.svn.wordpress.org/aboutimizer/trunk@906274 b8457f37-d9ea-0310-8a92-e5e31aec5664
Merge branch 'master' of github.com:seriouslysean/aboutimizer