Fixing issue with the greedy callback tags causing all tags to be treated as single tags and not blocks.
Merge branch 'master' into develop
Updating Changelog