Merge branch 'generation'
authorpimjager <pim@pimjager.nl>
Fri, 22 Apr 2016 10:06:31 +0000 (12:06 +0200)
committerpimjager <pim@pimjager.nl>
Fri, 22 Apr 2016 10:06:31 +0000 (12:06 +0200)

Trivial merge