Merge pull request #2555 from timwienk/master