Closes #1305