Merge pull request #535 from necolas/fix/img-border

Only normalize border-style on img