Reopen master for 19.1 (#810)

2 files changed