Merge branch 'master' of https://github.com/dopefishh/cc1516
authorpimjager <pim@pimjager.nl>
Fri, 20 May 2016 11:35:45 +0000 (13:35 +0200)
committerpimjager <pim@pimjager.nl>
Fri, 20 May 2016 11:35:45 +0000 (13:35 +0200)

Trivial merge