Merge branch 'release-19'
Merge remote-tracking branch 'ospalh/master'
ce
Merge branch 'develop' into feature-ospalh-special
ce
Bump version
Merge branch 'release-18.0.1'
Merge branch 'release-18.0.1' into develop
Merge remote-tracking branch 'ospalh'
Merge branch 'master' into feature-ospalh-special

Conflicts:
	local_css_and_diy_night_mode.py
	scalar.py
Fix the merge. Be more lax. Go back to spans again.
The spanify add-on.
Merge branch 'develop' into feature-ospalh-special
Merge remote-tracking branch 'ospalh/develop-ospalh-special' into feature-ospalh-special

Conflicts:
	scalar.py
Just one span button for me.