Revert "3.4/develop"
Merge pull request #2 from cyrgit/revert-1-3.4/develop

Revert "3.4/develop"