Merge git://github.com/damianmichna/gitmagic