Fix for missing borders.

Closed Bitbucket Importer requested to merge bitbucket/declined-pr-244 into branch/2.6