trying this squashing
Merge branch 'master' of github.com:craigspaeth/positron