Merge branch '2020-06-15T12_25_26_171555' into 'master'

2020 06 15 t12 25 26 171555

See merge request !9
1 job for cr/ts_102657/132_133_134_135
in 6 seconds, using 0 compute credits, and was queued for 0 seconds