Merge branch '4.9'

diff --cc src/CMakeLists.txt
Simple merge

diff --cc src/kitemviews/kfileitemmodelrolesupdater.cpp
Simple merge

diff --cc src/kitemviews/kitemlistview.cpp
Simple merge

diff --cc src/panels/places/placespanel.cpp
Simple merge