Merge pull request #2338 from mmottl/master

GitHub transition