Merge proposals dependent on lp://staging/~justas.sadzevicius/schooltool/fixes_2.1

lp://staging/~justas.sadzevicius/schooltool/fixes_2.1 has no merge proposals.