Merge pull request #479 from danvk/master+hairlines