Merge branch 'hotfix/oberlin_references' into taggit