9 December snapshot
Merge remote-tracking branch 'remotes/his/master'