touch (travis ci)
Merge branch 'master' into 2.0
do not encode Keyword instances to strings anymore