Merge from origin/emacs-25

e80f6a210b0 Describe problems with Microsoft Intellipoint
a73ec1edb07 More accurate documentation of the ':box' face attribute

diff --cc doc/lispref/display.texi
Simple merge

diff --cc etc/PROBLEMS
Simple merge