reopen master for 18.1 (#761)

* reopen master for 18.1

* there are four dashes
2 files changed