Merge branch 'master' into svn

Conflicts:
	readme.txt

git-svn-id: https://plugins.svn.wordpress.org/papercite/trunk@746421 b8457f37-d9ea-0310-8a92-e5e31aec5664
Version 0.5.1

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