Merge pull request #1668 from alexanderkyte/bug1856