prepare 6.1.x based on 6.1.13
Merge pull request #55 from dterweij/6.1.x

prepare 6.1.x based on 6.1.13