Merge remote-tracking branch 'upstream/master'
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Fri, 15 Apr 2016 09:22:27 +0000 (11:22 +0200)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Fri, 15 Apr 2016 09:22:27 +0000 (11:22 +0200)

Trivial merge