Merge branch 'fix-34'

Conflicts:
	client.js
Merge remote-tracking branch 'origin/meteor-0.6.0'