master
Merge branch 'upstream-1.8'
Material refactoring: Rename texture units.
Free fly controller and multitouch adapter (#397)