upstream/2.3-current-2013-10-16
Merge upstream-2.3-current-2013-10-16 1/2
Merge branch 'upstream' 2/2