Merge commit '639323a' into MergeFix (soon to be master)

Conflicts:
	soe/workshop-1/existing.tex
	soe/workshop-1/implementation.tex