Cleanup old matrix merge
Merge branch 'master' of github.com:x4nd3r/cage