Merge branch 'sophist_compilation_TCMP_adjustments' of git://github.com/Sophist-UK/picard into Sophist-UK-sophist_compilation_TCMP_adjustments