Bugfix: Problems with cStringIO from six -> gone back to standard cStringIO for now
merge
merge
merge