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

Trivial merge