reformatted previous changes to operate more easily with diffs
Merge branch 'upstream-merge'

Conflicts:
	plugins/draw-tools.user.js