mantis 190

financiemiento
Merge branch '190'