Merging changes in eokeeffe/oculus to muhrix/oculus

See commit comments.