Merge branch 'sct-viewer-master' of https://github.com/robstradling/openssl into...