Closes #1115