Merge branches 'master' and 'tags_fix'