sync last changes to Eclipe version before move to Studio
Merge branch 'eclipse'