merge 0.19.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sun, 3 Nov 2013 17:31:34 +0000 (18:31 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Sun, 3 Nov 2013 17:31:34 +0000 (18:31 +0100)

Trivial merge