Release 2.1.4: merge remote-tracking branch 'origin/master' into release
authorLars Op den Kamp <lars@opdenkamp.eu>
Fri, 13 Dec 2013 18:58:56 +0000 (19:58 +0100)
committerLars Op den Kamp <lars@opdenkamp.eu>
Fri, 13 Dec 2013 18:59:07 +0000 (19:59 +0100)

Trivial merge