merge remote from https://github.com/E2OpenPlugins/e2openplugin-OpenWebif/commits/master