Merge remote-tracking branch 'origin/master' into v26

This is a no-op merge to reconcile the differences in the Commit receivers.
This commit is contained in:
Carlos Martín Nieto 2017-07-08 17:20:46 +02:00
commit d29ae45d5e

Diff Content Not Available