Saving state pre-merge
Merge branch 'master' of https://github.com/ptal/nominal-workbench
commit post-merge