Parser->addKeyword() will erase first; NOW the ReplaceKeyword works
Merge remote-tracking branch 'upstream/master'