Merge branch 'master' of https://github.com/jquery/jquery

diff --combined src/dimensions.js
index b4dae83,17b4f8f..a292899
--- 1/src/dimensions.js
--- 2/src/dimensions.js
+++ b/src/dimensions.js
@@@ -25,7 -25,7 +25,7 @@@ jQuery.each([ "Height", "Width" ], func
                if ( !elem ) {
                        return size == null ? null : this;
                }
-               
+ 
                if ( jQuery.isFunction( size ) ) {
                        return this.each(function( i ) {
                                var self = jQuery( this );
@@@ -36,7 -36,7 +36,7 @@@
                if ( jQuery.isWindow( elem ) ) {
                        // Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
                        return elem.document.compatMode === "CSS1Compat" && elem.document.documentElement[ "client" + name ] ||
 -                              elem.document.body[ "client" + name ];
 +                              elem.document.body[ "client" + name ] || window.screen && window.screen[ name ];
  
                // Get document width or height
                } else if ( elem.nodeType === 9 ) {