Merge #833 into master