Merge branch 'master' of https://github.com/gjanssens/swig into gjanssens-master

* 'master' of https://github.com/gjanssens/swig:
  Guile: make scm to string conversion work with non-ascii strings
  Guile: illustrate bug in non-ascii string handling