reverse-Merge branch 'upstream' into x-Montgomerie