Merge remote-tracking branch 'upstream/master'
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Fri, 20 May 2016 07:40:22 +0000 (09:40 +0200)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Fri, 20 May 2016 07:40:22 +0000 (09:40 +0200)

Trivial merge