Merge branch 'next' of git://github.com/aquynh/capstone into xcodeproj