Merge branch 'mgorse' into socketplug