Closes #1314