Move test setup to the right place
Auto-merge remote-tracking branch 'upstream/master'
Merge pull request #2 from X-Plat/master

Merge with official release