Closes #1539