Revert "Revert "29-7-2013""

This reverts commit 12435fbdf6d404c49590271c84a519ab68ac5ed5.