REPORT-487 - Mapping parameters to expressions should support numeric addition and subtraction

Apologies about the merges in here, I think I must have had local changes to my .gitignore file when I pulled from upstream.