Minor changes supporting conifer's new SPR move
Merge branch 'master' of https://github.com/alexandrebouchard/bayonet