This closes #2911