Fix borderTopWidth
Merge branch '1.x'