Merge branch 'master' into wip_leon_T7975_caption_check_on_pasted_images

diff --cc roojs-all.js
Simple merge

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

diff --cc roojs-bootstrap.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