Merge remote-tracking branch 'upstream/master'
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Wed, 29 Jun 2016 08:26:51 +0000 (10:26 +0200)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Wed, 29 Jun 2016 08:26:51 +0000 (10:26 +0200)

Trivial merge