Merge branch 'caret_operator'