String: raise Invalid on deserialization from a non-string (fixes #100)
Update change log, add myself (plamut) to a list of contributors
fix merge conflicts
Merge branch 'plamut-master'