Dia 28-11-14
Revert "Dia 28-11-14"

This reverts commit cdabeb707bf536590af516ace74bf4032534633c.
Revert "Revert "Dia 28-11-14""

This reverts commit c7112c86da28ffea2cbb5bad6e56a268393130ca.