Merge proposals dependent on lp:~replaceafill/schooltool/schooltool_fixes

lp:~replaceafill/schooltool/schooltool_fixes has no merge proposals.