Merge branch 'master' into ci
Merge branch 'ci' of github.com:28msec/nolap-report-editor into ci