Merge branch 'next' of calcium:git/Sone into next