Merge branch 'trunk' of https://github.com/Mechtilde/gitmagic