merge branch 0.19.x into master
authorStefan Behnel <stefan_ml@behnel.de>
Fri, 11 Oct 2013 16:03:18 +0000 (18:03 +0200)
committerStefan Behnel <stefan_ml@behnel.de>
Fri, 11 Oct 2013 16:03:18 +0000 (18:03 +0200)

Trivial merge