Merge pull request #1 from nwiechmann/master

Update Changes
Merge remote-tracking branch 'forked/scm-updates'
Merge remote-tracking branch 'forked/scm-updates'
changed test implementation according to new behaviour
Merge remote-tracking branch 'forked/scm-updates'
Merge remote-tracking branch 'forked/scm-updates'
Merge remote-tracking branch 'forked/scm-updates'
Merge remote-tracking branch 'forked/scm-updates'
Merge pull request #2 from aperto/master

doku