Merge branch 'master' into matthiaskrgr/srgb
authorMatthias Krüger <matthias.krueger@famsik.de>
Mon, 31 Aug 2015 15:56:09 +0000 (17:56 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Mon, 31 Aug 2015 15:56:09 +0000 (17:56 +0200)

Trivial merge