climbing metaphor
Merge branch 'oculus'
fixes merge conflicts