Closes #1493