Merge pull request #967 from fanquake/patch-1