Merge with 0.9.9.12

git-svn-id: https://plugins.svn.wordpress.org/wp-piwik/trunk@934692 b8457f37-d9ea-0310-8a92-e5e31aec5664