Merge remote-tracking branch 'remotes/upstream/master'
Initial support for the OL extended protocol and support for the new cross attributes
Merge remote-tracking branch 'upstream/master'