Final commit before v2.0.1a release
Fixed //replace command sometimes not working