Merge branch 'dojo-1.12.1'

Conflicts:
	js/prefs.js

diff --cc js/prefs.js
index 628e66a111254047a2dcb83ab0f6d0009ba1b514,7db46ecd79f9b8aade145a870a248153ece69cff..69e779d4505dfa8ddcc5e14b143a03c8cc9a0579
--- 1/js/prefs.js
--- 2/js/prefs.js
+++ b/js/prefs.js
@@@ -1808,6 -1809,3 +1809,7 @@@ function clearSqlLog() 
        }
  }
  
 +function updateSelectedPrompt() {
 +      // no-op shim for toggleSelectedRow()
 +}
++