Andreas Braun d96306f8a7 Merge branch '1.0.x' 9 lat temu
..
Alcaeus 04fd2427b7 Fix wrong usage of trigger_error 9 lat temu
Mongo d96306f8a7 Merge branch '1.0.x' 9 lat temu