Merge pull request #1418 from LongerVision/master