Update pagelayout for redirect and fix gradebook padding problem with a workaround (valid for both 2.6 and 2.7)
Merge remote-tracking branch 'upstream/master'