sxs
Merge branch 'master' of github.com:hleclerc/Stela

Conflicts:
	src/Stela/Scope/Scope.h