Merge branch 'master' into identica-badge