7337
Revert "7337"

This reverts commit ff8791b49cf1e8c55a3f0187d212eee18f72f69f.
Merge branch 'devel' of https://github.com/in-the-keyhole/git-demo into devel
Merge branch 'devel' of https://github.com/in-the-keyhole/git-demo
Merge remote-tracking branch 'origin/master'