Merge pull request #910 from fanquake/master