Fixed bug in serializers
Fixed another bug in apiv2 serializers
Fixed yet another bug in apiv2 serializers
Fixing the previous bug fix in apiv2 serializers
Merge branch 'master' into groma