Merge pull request #787 from rogerpueyo/luci-proto-ipip