Merge branch 'feature/init-cleanup'
authorIngo Ruhnke <grumbel@gmail.com>
Sun, 17 Aug 2014 20:34:44 +0000 (22:34 +0200)
committerIngo Ruhnke <grumbel@gmail.com>
Sun, 17 Aug 2014 20:34:44 +0000 (22:34 +0200)

Trivial merge