Merge remote-tracking branch 'origin/1.2.2' into 1.2.2

# Conflicts:
#	README.md
pull/34/head
jason 6 years ago
commit 1927007fa8

Diff Content Not Available