Cherry Pick Serializers
fix stuff from rails 4 that should not have been brought in