Merge commit 'refs/merge-requests/1' of git://gitorious.org/mahara/mahara-scripts into merge-requests/1