Merge branches 'develop' and 'master' of github.com:rproepp/spykeutils into develop
Merge branch 'develop' of github.com:rproepp/spykeutils into develop