Fixed bug in serializers
Merge branch 'master' into frederic