Wns merge with master

Just merging in master to the writable-nested-serializers branch.