Merge ../pl into staging

js/wPaint

@@ -1 +1 @@
-Subproject commit 2c272dffca0f3d7b7163bd82ba15629f54409278
+Subproject commit 15bae4a9181ddb283c1cad0979c44cefd4f15a44

js/wpaint.js

@@ -83,7 +83,7 @@ oekaki.init = function() {
         stop: function(event,ui) {
           $("#wpaintdiv").wPaint("resize");
         },
-        alsoResize: "#wpaintdiv, #wpaintdiv canvas",
+        alsoResize: "#wpaintdiv",
       });
 
       $('#wpaintctr .ui-resizable-se').css({'height':'12px', 'width':'12px'});