Support for escalator field (issue #162).
Merge remote-tracking branch 'origin/master'