Reopen master for 1.6 (#3112)

3 files changed