Cannot insert images into table cells

Using media and the CKeditor modules, when I add an image in a table cell it initially appears to be in the correct place but when I save (or click the link to disable CKeditor and see the markup) the image ends up above the table in a p tag.

When the image is initially inserted the markup looks like this:

<table cellspacing="1" cellpadding="1" border="1" summary="test">
  <caption>test</caption>
  <tbody>
    <tr>
      <td>asdfasd</td>
      <td>asdfasdf</td>
      <td>asdfasdf</td>
    </tr>
    <tr>
      <td>asdfasdfas</td>
      <td>
        <mediawrapper data="">
          <img width="253" height="138" title="sdfgsdf" alt="sdfgsdfg" src="http://example.com/sites/default/files/styles/stylename/public/image.jpg?itok=y3pCSk2k" data-fid="544" data-media-element="1" class="media-element file-wysiwyg" _moz_resizing="true">
        </mediawrapper>
        <br>
      </td>
      <td>asdfasdfasd</td>
    </tr>
  </tbody>
</table>

After it looks like this:

<p>&nbsp;</p>
[[{"fid":"544","view_mode":"wysiwyg","type":"media","attributes":{"alt":"sdfgsdfg","title":"sdfgsdf","height":138,"width":253,"class":"media-element file-wysiwyg"},"link_text":null}]]

<table border="1" cellpadding="1" cellspacing="1" summary="test">
  ...
</table>

Then after another save it looks like this

<p>&nbsp;</p>

<p>[[{"fid":"544","view_mode":"wysiwyg","type":"media","link_text":null,"attributes":{"alt":"sdfgsdfg","title":"sdfgsdf","height":138,"width":253,"class":"media-element file-wysiwyg"}}]]</p>

<p>&nbsp;</p>

<table border="1" cellpadding="1" cellspacing="1" summary="test">
  ...
</table>

It seems that if I then edit the node, switch to non-wysiwyg mode and manually move the media token back into the table, like this, then it works again:

<table cellspacing="1" cellpadding="1" border="1" summary="test">
  <caption>test</caption>
  <tbody>
    <tr>
      <td>asdfasd</td>
      <td>asdfasdf</td>
      <td>asdfasdf</td>
    </tr>
    <tr>
      <td>asdfasdfas</td>
      <td>[[{"fid":"544","view_mode":"wysiwyg","type":"media","link_text":null,"attributes":{"alt":"sdfgsdfg","title":"sdfgsdf","height":138,"width":253,"class":"media-element file-wysiwyg"}}]]</td>
      <td>asdfasdfasd</td>
    </tr>
  </tbody>
</table>

Then when I go back to the wysiwyg mode the markup is now this:

<table cellspacing="1" cellpadding="1" border="1" summary="test">
  <caption>test</caption>
  <tbody>
    <tr>
      <td>asdfasd</td>
      <td>asdfasdf</td>
      <td>asdfasdf</td>
    </tr>
    <tr>
      <td>asdfasdfas</td>
      <td><img width="253" height="138" src="http://example.com/sites/default/files/styles/stylename/public/image.jpg?itok=y3pCSk2k" data-cke-saved-src="http://example.com/sites/default/files/styles/stylename/public/image.jpg?itok=y3pCSk2k" data-media-element="1" data-fid="544" class="media-element file-wysiwyg" alt="sdfgsdfg" title="sdfgsdf"></td>
      <td>asdfasdfasd</td>
    </tr>
  </tbody>
</table>

So the difference between that and the broken one is the mediawrapper tag and the data-cke-saved-src attribute.