Merged trac list#311

haraldschilly merged 4 commits intosagemath:mastersagemath/website:masterfrom

kwankyu:merge-trackwankyu/website:merge-tracCopy head branch name to clipboard