#912 reopened for master branch

#912
Your call. Tell me if you want me to convert this to a K error.