Merge branch 'tlock' into 'master'

ticket lock

@jung merge?

See merge request !1
1 job for master in 4 minutes (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #589
coq
buildjob

00:04:00