Merge pull request #3485 from f3flight/master