Merge pull request #1218 from AndreyAkinshin/master