merges pull #824