Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I5db3f62185e7e99ce2c701debd00a44f40a9f5e5

diff --cc src/linguist/linguist/mainwindow.cpp
Simple merge

diff --cc src/linguist/lupdate/cpp.cpp
Simple merge

diff --cc src/linguist/lupdate/main.cpp
Simple merge

diff --cc src/linguist/shared/translator.cpp
Simple merge

diff --cc tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp
Simple merge