Merge branch 'v1.3.x'
Merge pull request #167 from boegel/master

v1.3.0 release
bump version to v1.3.1dev
Merge pull request #170 from boegel/v1.3.x

bump version to v1.3.1dev