Squashed commit of the following:

commit 8ba3b604a30ff869c26b53b24b467f8ec8f23104
Author: dylans <dylan@dojotoolkit.org>
Date:   Sat Dec 7 16:34:51 2013 -0700

    refs #17116, refs #17402, fix typo in dojox/form/Uploader

commit b19aef128ef890d78bbc44e3bbf1102ad52030f4
Merge: 4a40d29 1757730
Author: dylans <dylan@dojotoolkit.org>
Date:   Mon Dec 2 14:06:12 2013 -0700

    refs #17589, merge ScrollPane fix from @youngho, Merge branch 't17589' of github.com:dylans/dojox