Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 5b8b04455bc74109d4f19c2c1bcf5b3a7c9cb167.
Revert "Revert "Merge remote-tracking branch 'origin/master'""

This reverts commit d83de3c384474f0332736ccb881734a13214a156.