Allow to customize description so that markup can be accepted if needed.
Merge pull request #1180 from kevin-brown/pull_1164

Put template block around the description