Reorder.

Signed-off-by: crynobone <crynobone@gmail.com>
Small tweak.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.0' into 2.1

Signed-off-by: crynobone <crynobone@gmail.com>

Conflicts:
	README.md
Merge branch '2.1' into 2.2
Merge branch '2.2'

Signed-off-by: crynobone <crynobone@gmail.com>

Conflicts:
	README.md