Merge branch 'theadsticky' into 'master'

Theadsticky

See merge request !181
3 jobs for master in 2 minutes and 43 seconds (queued for 1 second)