merge 0.19.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sat, 23 Nov 2013 13:14:45 +0000 (14:14 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Sat, 23 Nov 2013 13:14:45 +0000 (14:14 +0100)

Trivial merge