There were some outstanding changes made a few months ago that haven't been checked in, so getting those as the final commit before the transition to Laravel
