This branch was branched off of the old learningequality/develop branch (to try and split up branches, reduce dependencies), so I had to run the merge after the code checkin yesterday.  Done now!