Move these to the commons
Merge pull request #2 from Lloir/cm-10.2

Move these to the commons