Patch Set 4: I would prefer that you didn't submit this

- rebased to master
- fixed minor issues
- removed last reference to GitIndex 
- this proposal still leads to two failing merge-tests probably caused by removal of GitIndex usage