Follow up to merge of 'upstream/master' into popup-widget
Follow up to merge of 'upstream/master' into popup-widget

hinaloe/jqm-demo-ja,arschmitz/uglymongrel-jquery-mobile,npmcomponent/cbou-jquery-mobile,arschmitz/uglymongrel-jquery-mobile,hinaloe/jqm-demo-ja,hinaloe/jqm-demo-ja,startxfr/jquery-mobile,npmcomponent/cbou-jquery-mobile,arschmitz/uglymongrel-jquery-mobile,arschmitz/jquery-mobile,arschmitz/jquery-mobile,startxfr/jquery-mobile,npmcomponent/cbou-jquery-mobile,arschmitz/jquery-mobile,startxfr/jquery-mobile