Merge from master

https://github.com/E2OpenPlugins/e2openplugin-OpenWebif/commit/6cf164b25484bb9e1df5e52807063276cc03c0e3