Merge https://github.com/vnwildman/gitmagic