Merge remote-tracking branch 'upstream/master'
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Thu, 12 May 2016 14:36:40 +0000 (16:36 +0200)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Thu, 12 May 2016 14:36:40 +0000 (16:36 +0200)

Trivial merge