Here be dragons.
Merge remote-tracking branch 'origin/master'

Conflicts:
	spec/README.md
Here be dragons!