Merge sprout pull #783