Fixed some problems caused by the merge.
Fixed some problems caused by the merge.
Merge branch 'master' of https://github.com/Tietoarkisto/metka