Commit 37c19daa authored by Yi Lin's avatar Yi Lin

Merge branch 'develop' into 'master'

merge with develop

See merge request !50
parents b90588c0 a25abd66
Pipeline #1257 passed with stages
in 49 minutes and 40 seconds