Tidy the prototype a bit.
Republish tinsel repo.
Merge branch 'dev'