Rc/2014 04 15

Same as rc/2014-04-04 (#272) except it includes @andy-armstrong 's changes to the HTML for Studio editing.