Merge origin/master into gh-pages

Conflicts:
	README.md