Merge branch 'master' of git.uwaterloo.ca:jmshahen/solidity-safety-to-model-checking into 28-allow-macos