Merge branch 'develop' into 'master'

Renamed VariableSymbol to ParameterSymbol

See merge request !16
2 jobs for master in 5 minutes and 34 seconds (queued for 20 seconds)