updated from skype 29.10
Merge branch 'master' into D_Sidorov
LayoutControl have been renamed