Closes #1242
Merge branch '4.1'