Cheatsheet: basic commands
Merge branch '2.1-cheatsheet' into 2.1-test