mentioned in commit 25fada41
merged
changed milestone to %v26r6
changed title from Merge 2017-patches into master to Merge master into 2017-patches