Fix error searching at boundary of trix blocks.
Merge branch '0.11.x'

Conflicts:
	js/version.js
	test37.html