reset
Merge remote-tracking branch 'origin/master'

Conflicts:
	inst/www/binding.js