Merged conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/vaadin/highlighter/ComponentHighlighterExtension.java