Resolves #1368

See commit log for further details.