options are  propagated to supertype (see #126)
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/MeasuringTape.js