Merge branch 'master' into Shoes01-xcomms