Merge branch 'edge' into feature/spindle-refactor
authorbouni <bouni@owee.de>
Mon, 6 Jul 2015 10:28:07 +0000 (12:28 +0200)
committerbouni <bouni@owee.de>
Mon, 6 Jul 2015 10:28:07 +0000 (12:28 +0200)

Trivial merge