Added infrastructure for step expression parsing.
Merge remote-tracking branch 'origin/master'