Fix copyright year
Merge pull request #921. Fix #920 in master
Merge pull request #955
Merge pull request #955 in develop