Merge branch 'ticket10333' of http://github.com/Celeroctos/moniiag into release
(!)
(!)
Merge branch 'ticket12541' of http://github.com/Celeroctos/moniiag