Merge pull request #3 from inglis-dl/onyx-1.8.x

Onyx 1.8.x
Merge remote-tracking branch 'upstream/onyx-1.8.x' into onyx-1.8.x