AutoOccupied only as default
Merge branch 'popTrajSet' of https://github.com/djoshea/trial-data into popTrajSet