Merge remote-tracking branch 'upstream/master'
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Wed, 10 Aug 2016 15:29:16 +0000 (17:29 +0200)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Wed, 10 Aug 2016 15:29:16 +0000 (17:29 +0200)

Trivial merge