Revert "snapshot 14-07-26 17:37"

This reverts commit 5796de35143578e62e6afc55c3a94b2d552295a3.
snapshot 14-07-26 17:52