Revert "Revert "comite20141116-19:02""

This reverts commit ac1ca6b2313a0acb5ab9226f73f53cab60303db6.