Commit af8f389f authored Jun 26, 2020 by Andreas Klöckner

Merge branch 'context' into 'master'

Simplify context handling

See merge request !24