Merge branch 'release-0.9.6'
authorFerry Huberts <ferry.huberts@pelagic.nl>
Fri, 10 Feb 2017 10:35:24 +0000 (11:35 +0100)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Fri, 10 Feb 2017 10:35:24 +0000 (11:35 +0100)
* release-0.9.6:
  Update version after release of v0.9.6.1
  Release v0.9.6.1

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>

Trivial merge