Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Wed, 18 Dec 2013 01:16:24 +0000 (02:16 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Wed, 18 Dec 2013 01:16:24 +0000 (02:16 +0100)

Trivial merge