Add messages to all assertions in the Diet template parser.
Merge remote-tracking branch 'upstream/master'