Merge pull request #1781 from dtwlin/m2