Merge remote-tracking branch 'upstream/develop' into feature/variable_management_merge_develop

generators/php/procedures.js

@@ -69,7 +69,6 @@ Blockly.PHP['procedures_defreturn'] = function(block) {
   }
   var code = 'function ' + funcName + '(' + args.join(', ') + ') {\n' +
       globals + branch + returnValue + '}';
-  code = Blockly.PHP.scrub_(block, code);
   // Add % so as not to collide with helper functions in definitions list.
   Blockly.PHP.definitions_['%' + funcName] = code;
   return null;