Merge branch 'master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Fri, 31 Oct 2014 19:11:22 +0000 (20:11 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Fri, 31 Oct 2014 19:11:22 +0000 (20:11 +0100)

Trivial merge