Merge branch 'dsprenkels/organization'
authorDaan Sprenkels <dsprenkels@gmail.com>
Mon, 21 Nov 2016 09:21:09 +0000 (10:21 +0100)
committerDaan Sprenkels <dsprenkels@gmail.com>
Mon, 21 Nov 2016 09:21:09 +0000 (10:21 +0100)

Trivial merge