dusting off
Merge commit '0b9a6ea'

Conflicts:
	gostrich.go