Checklist
[ ]
make -j4 test
(UNIX), or
vcbuild test
(Windows) passes
[ ] tests and/or benchmarks are included
[ ] documentation is changed or added
[ ] commit message follows
commit guidelines