Dia 14-12-14
Revert "Dia 14-12-14"

This reverts commit 22268b0574c84615a18c4ce2895e9a517d91398d.
Revert "Revert "Dia 14-12-14""

This reverts commit d56ad3b7c7d7b77b28702c1e904efaf3a9020c63.