Merge remote-tracking branch 'upstream/master'
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Sat, 16 Jul 2016 21:51:51 +0000 (23:51 +0200)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Sat, 16 Jul 2016 21:51:51 +0000 (23:51 +0200)

Trivial merge