Merge branch 'master' into wip_leon_T7832_html_editor_block_figure_right

diff --cc roojs-all.js
Simple merge

diff --cc roojs-debug.js
Simple merge

diff --cc roojs-ui-debug.js
Simple merge

diff --cc roojs-ui.js
Simple merge