Merge !1197

Triptych paper

See merge request !1197
1 job for master in 56 seconds (queued for 3 seconds)