Commit 9110940d authored by Dominik Hebeler's avatar Dominik Hebeler

Merge branch '965-oops-error' into 'development'

Resolve "Oops Error"

Closes #965

See merge request !1593
parents bb5f1cdf 08ffe80a