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

Trivial merge