Merge branch alfroch-DIPS-attention with refs/heads/master into refs/merge-requests/215/train

22 jobs for !215 with alfroch-DIPS-attention into master in 18 minutes and 7 seconds (queued for 6 seconds)
merge train