Revert "Master"

This reverts commit b7daf112a1b747900e6f9781a86a0c79bfb9a223.
Commit 26-06-2014

Commit 26-06-2014