Allow data attributes from rich text

We've also had to paste in the whole tuple of defaults :(
Merge branch 'develop'