On all branches: A) Run grunt shifter and ensure no shifter errors are experenienced B) RTL Plugin (on all branches) Repeat testing instructions from MDL-46497 copied below. Note, we are not changing any functionality here, so please only report a regression relating to this patch. Make sure you are using Atto editor (User's preferences) and that you are using the English UI language. Navigate to: Site administration ► Plugins ► Text editors ► Atto HTML editor ► Atto toolbar settings Inside "Toolbar config", add ",rtl" to "align = align" (so it looks like "align = align,rtl"). And save settings. (So now you have two new buttons on the Atto's second/hidden toolbar - RTL/LTR) Navigate into a page where you can use the HTML editor (You can start a Discussion on a Forum or Edit your own user's description on your profile page) Type into the Atto editor a few words (You can paste: "אני כותב בעברית And also in English וחוזר לכתוב בעברית") Now, click the "" Atto toolbar button and then click the "" button. And repeat it 2-3 times. Switch to HTML mode (use the "<>" icon on the Atto's second/hidden toolbar) Make sure there are no redundant HTML P elements surrounding your text. (As seen on the attached screen capture) On master/30 only: A) Test for item_is_allocated_to_dropzone change: Add a new 'drag and drop onto image' question, your going to be testing the this form page only. Add a Question name/text and upload a background image. Add three draggable text items 'item one', 'item two' and 'item three' Tick the unlimited option for item three In 'drop zones' choose the draggable item 'item one' for Drop zone 1 VERIFY: In Drop zone 2 (and all other drop zones) that the select item for 'item one' is disabled and 'item two' is enabled In drop zone 2 select 'item two' VERIFY: In drop zone 3 (and following drop zones), only item 3 is able to be selected In drop zone 3 select 'item three' VERIFY: In drop zone 4 (and following drop zones), only item 3 is still able to be selected Unselect some optins and VERIFY they are then able to be selected in other drop zones B) Test for redraw_dd_area change: Add a new 'drag and drop onto image' question, your going to be testing the this form page only. Add a Question name/text and upload a background image. Add two draggable items First an image with a title 'item one' Second a text item 'item two' Allocate the two items to drop zones They should display on the preview image above Change item one from an image to a text item VERIFY: the 'item one' preview changes from an image to a text item Now change the group of 'item two' and watch the preview VERIFY: 'item two' preview changes colour to reflect the different group Tick the unlimited option for item three In 'drop zones' choose the draggable item 'item one' for Drop zone 1 VERIFY: In Drop zone 2 (and all other drop zones) that the select item for 'item one' is disabled and 'item two' is enabled In drop zone 2 select 'item two' VERIFY: In drop zone 3 (and following drop zones), only item 3 is able to be selected In drop zone 3 select 'item three' VERIFY: In drop zone 4 (and following drop zones), only item 3 is still able to be selected Unselect some optins and VERIFY they are then able to be selected in other drop zones c) Run behat --tags @qtype_ddimageortext