Merge pull request #5658 from blissland/master