Conflicts: htdocs/lib/db/upgrade.php htdocs/lib/mahara.php htdocs/lib/version.php htdocs/user/view.php