adding third party X13 and Diamond Groestl code contributions.
bump to revision V1.2
Merge remote-tracking branch 'upstream/master'