[pull] master from nawforce:master#21

pull[bot] wants to merge 33 commits into

dxatscale:masterdxatscale/apex-parser:masterfrom

nawforce:masternawforce/apex-parser:masterCopy head branch name to clipboard