Fix for None value passed to truncate
Fix truncate to work
Merge branch 'master' into issue-977-mailchimp