rebase linestyle patches against sage-5.11b3