Beautify.
Merge branch 'master' into gh-pages

Conflicts:
	meta/icon_bitcoin.svg