Merge branch 'master' into teev-qt
Merge branch 'master' into teev-qt
Merge branch 'master' into teev-qt
Merge branch 'master' into teev-qt
teev-qt: don't use libjsoncpp if we're building against QT5 or later
Merge branch 'teev-qt' into teev-qt-descriptors-new