Merge branch 'master' into BR_PYTHON_PLUGIN

diff --cc src/Config/CMakeLists.txt
Simple merge

diff --cc src/Config/Config_Keywords.h
Simple merge

diff --cc src/Model/Model_Session.cpp
index 921017d11f25abde11e3b8a227261c17a7152a95,23e7a2621633170b0ecf97ec6034c8a62dfc54a1..16a4d07f0bc2d242ffd2b63de10d32fdc5e8978a
--- 1/src/Model/Model_Session.cpp
--- 2/src/Model/Model_Session.cpp
+++ b/src/Model/Model_Session.cpp
@@@ -91,11 -92,9 +92,10 @@@ void Model_Session::redo(
  
  FeaturePtr Model_Session::createFeature(string theFeatureID)
  {
 -  if (this != myImpl)
 +  if (this != myImpl) {
      return myImpl->createFeature(theFeatureID);
 +  }
  
-   LoadPluginsInfo();
    if (myPlugins.find(theFeatureID) != myPlugins.end()) {
      std::pair<std::string, std::string>& aPlugin = myPlugins[theFeatureID]; // plugin and doc kind
      if (!aPlugin.second.empty() && aPlugin.second != activeDocument()->kind()) {

diff --cc src/ModelAPI/CMakeLists.txt
Simple merge

diff --cc src/ModelAPI/ModelAPI_Session.h
Simple merge