Merge pull request #1062 from radarhere/master