Closes #1193
Merge branch '4.0' into 4.1