Merge branch 'fix-34'

Conflicts:
	client.js
Merge branch 'meteor-0.6.0'