Allow hard limiting of pre-transit time

This change is necessary in order to allow the long-distance mode to work. In the long term, however, it need not be the best solution.
Merge branch 'master' into experimental