Escape variables
Merge remote-tracking branch 'remotes/upstream/master' into systemtap