fix link language and shouldIncludeLanguage
Merge branch 'master' of git://github.com/rapila/cms-base
Merge branch 'master' into release-1.1