merge default trunk changes

Author: rouilj

issues/extensions/templating.py

@@ -111,7 +111,7 @@ def get_status_of_module(module, prefix=None, version=True):
 
         info.append("<h2>Environment Variables</h2>")
         info.append("<pre>") # include pre to prevent wrapping of values
-        for key in db._client.env.keys():
+        for key in list(db._client.env.keys()):
             info.append("%s=%s"%(key,db._client.env[key]) + "<br>")
         info.append("</pre>")
     return "\n".join(info)

website/issues/extensions/templating.py

@@ -166,7 +166,7 @@
 </tr>
 <tr tal:condition="context/is_edit_ok">
   <td colspan=4>
-   <textarea readonly id="DropZone">
+   <textarea readonly id="DropZone" aria-labeledby="DropZone">
      paste images or drag and drop files here....
    </textarea>
   </td>