Cm10.1

Pulling in DerArtem's current work to keep my Github up to date.