Merge remote-tracking branch 'github/master/dubrovka' into master/dubrovka
Prevent a bug with <link> tag (?)
Fix warning due to bad populate
Merge remote-tracking branch 'github/master/dubrovka' into master/dubrovka