Happy new year, again.
Merge branch 'master' into 13.rose-version