Commit 9cc9b7b0 authored Feb 04, 2018 by Andreas Klöckner

Merge branch 'complex_add' into 'master'

Limit recursion errors

See merge request !221