Merge branch 'pull-req-from-46'
Merge branch 'pull-req-format-strings'