Oops forgot to merge.
Merge remote-tracking branch 'origin/master'

Conflicts:
	crypto_prikey1.go