Merge pull request #1986 from lassewesth/master

tc testing, ignore