JH 1 - Basic code enhancements: Token values may contain tokens
Merge pull request #543 from janpub/master

JH 1 - Basic code enhancements: Token values may contain tokens
Merge branch 'master' into xmlrepository