Closes #1255