Closes #1133
Merge branch '3.8'