Merge 'Walking skeleton' into master