Merge branch 'formatstring'