Merge branches 'master' and 'T1_lotfy_1.1_and_1.2'
Merge branch 'master' into T1_lotfy_1.8