merge
Merge branch 'master' of https://github.com/geraintj/Pinboard8

Conflicts:
	Pinboard8.v11.suo