Merge remote-tracking branch 'remotes/upstream/master'
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Tue, 14 Feb 2017 11:03:12 +0000 (12:03 +0100)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Tue, 14 Feb 2017 11:03:12 +0000 (12:03 +0100)

Trivial merge