update after pulling from master

Right now the subject tags page is busted, but this PR seems to fix that problem (probably rails 4.1 related).
I think this is the actual fix for our problem