Merge remote-tracking branch 'origin/master'

Conflicts:
	misc.el
Scroll conservatively
Merge remote-tracking branch 'origin/master'

Conflicts:
	misc.el