Merge branch 'master' of https://github.com/dopefishh/cc1516
authorpimjager <pim@pimjager.nl>
Thu, 26 May 2016 14:16:23 +0000 (16:16 +0200)
committerpimjager <pim@pimjager.nl>
Thu, 26 May 2016 14:16:23 +0000 (16:16 +0200)

Trivial merge