Commits in ~akiellor/trollop/akiellors-mainline:fix-tests-for-1.9.2