Erm, not sure how this was left over...
Fix the smarty insertable rendering.

There was a glitch where the insertable tag was rendered along with the inner contents.
Page insertables need to be saved even with a blank value.
Merge branch '2-6-stable'