Merge pull request #827 from Blewzman/master