Merge master into develop 4.0 branch#69

iMattPro merged 2 commits intodev/4.0phpbb-extensions/viglink:dev/4.0from

masterphpbb-extensions/viglink:masterCopy head branch name to clipboard