Merge remote-tracking branch 'upstream/master'
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Fri, 19 Aug 2016 22:11:04 +0000 (00:11 +0200)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Fri, 19 Aug 2016 22:11:04 +0000 (00:11 +0200)

Trivial merge