Update ActiveModel::Serializers to master