Merge remote-tracking branch 'upstream/master'
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Thu, 13 Apr 2017 11:47:06 +0000 (13:47 +0200)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Thu, 13 Apr 2017 11:47:06 +0000 (13:47 +0200)

Trivial merge