oliver major revision
Merge branch 'upstreammerge'