Merge branch 'next' of https://github.com/DavidCallahan/capstone into DavidCallahan-next