Merge changes from MAXIMA into WikiBrain