master
Merge branch 'upstream-1.8'
Support world origin rebase.
Free fly controller and multitouch adapter (#397)