Changed |tojson filter to quote single attributes
Merge branch '0.10-maintenance'