Merge pull request #3498 from pcwalton/border-box-double-counting

Stop double-counting stuff in inline-block

Reviewed-by: glennw
Merge pull request #3503 from Ms2ger/page-url

Simplify the Page URL handling in handle_resize_inactive_msg.

Reviewed-by: jdm
Fix the doc build step.
Merge pull request #3501 from zwarich/telement-lifetimes

Remove the 'static lifetime parameters from TElement methods

Reviewed-by: jdm
Merge pull request #3506 from metajack/fix-doc-build

Fix the doc build step.

Reviewed-by: SimonSapin
trace keys as well
Merge pull request #3508 from wenderen/JSTraceable.key

trace keys as well

Reviewed-by: Manishearth
Fix indentation in is_htmliframeelement.
Merge pull request #3509 from Ms2ger/indentation-iframe

Fix indentation in is_htmliframeelement.

Reviewed-by: jdm
Set default resolution to 1280x1024 now that reftests render to FBO.
Fix gdb helper for Au printer
Add some vertical align reftests now that text elements get correct vertical align property.
Merge pull request #3513 from glennw/default-res

Set default resolution to 1280x1024 now that reftests render to FBO.

Reviewed-by: metajack
Merge pull request #3514 from glennw/gdb-helper

Fix gdb helper for Au printer

Reviewed-by: metajack
Revert "Set default resolution to 1280x1024 now that reftests render to FBO."

This reverts commit c74798bb6bcb98d2d6af998e2ab0f08e79097147.
auto merge of #3517 : glennw/servo/revert-res-change, r=metajack

...FBO."

This reverts commit c74798bb6bcb98d2d6af998e2ab0f08e79097147.
auto merge of #3515 : glennw/servo/vertical-align, r=metajack
Update wptrunner to version 1.2.
auto merge of #3476 : Ms2ger/servo/rm-hotfix, r=Ms2ger,metajack

This was added in anticipation of a wptrunner release that includes the change.
Don't move the data when extracting the bytes in XMLHttpRequest::Send.

The data is used later to set the Content-Type header. Current rustc
(4d2af3861) does not detect this use-after-move, but treats the later use as
if the data was None. It will, however, detect the bug in d2b30f7d3, which we
are upgrading to.