Merge pull request #3047 from cjmayo/style_border