Referral note
Merge remote-tracking branch 'upstream/master'

Conflicts:
	node/src/main/views/join/finish.jade
Version update on release