Merge branch 'mob' into topic-telepathy