Merge branch 'Astroid'
Merge branch 'master' into Astroid