Merge branch 'master' into google

diff --cc src/mdictionary/backbone/History.cpp
Simple merge

diff --cc src/mdictionary/backbone/backbone.cpp
Simple merge

diff --cc src/plugins/xdxf/xdxfplugin.cpp
Simple merge