Merge branch 'v4-ext' of https://github.com/yamt/of_protocol into v5+v4-ext