Closes #1158