Revert "Revert "Techduto-2014-06-1810""

This reverts commit 8eaefff1a3bce3307661b6ca9af3427bec4f2620.