Fixed  exception thrown on std::string() constructor when value = NULL. This avoids all plug-ins to crash
Merge remote-tracking branch 'origin/master'