Reordered links to better places
Merge branch '1.1'