Trivium work.
Trivium complete.
Merge branch 'master' into hc256