Merge branch 'plane'

Conflicts:
tasks.txt