Merge branch 'master' into next

diff --cc src/kdenlivesettingsdialog.cpp
Simple merge

diff --cc src/mainwindow.cpp
Simple merge

diff --cc src/projectlist.cpp
Simple merge

diff --cc src/renderer.h
Simple merge

diff --cc src/wizard.cpp
Simple merge