Merge branch 'release-0.9.5'
authorFerry Huberts <ferry.huberts@pelagic.nl>
Wed, 21 Dec 2016 08:50:45 +0000 (09:50 +0100)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Wed, 21 Dec 2016 08:50:45 +0000 (09:50 +0100)
* release-0.9.5:
  main: improve EXECINFO include handling a bit

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

Trivial merge