Merge branch 'sw.nohom.extensions', remote branch 'origin/sw.nohom.extensions' into sw.nohom.extensions