Revert "Merge branch 'master' into gti-trunk"

This reverts commit fa14992890b0cda3311f829301fa94bfa7ae94e9, reversing
changes made to b94d618e7d7693bc0ef65830f0c13f7537e364f3.
gti-trunk specific changes - disabled unnecessary features
version=1.0.2