'merge' bugfixes/structural changes from vatsim branch.
Merge branch 'master' into vatsim