Resolved conflict.
Merge branch 'sehmaschine-master'