Force 3.x version of omega for compatibility reasons
Merge branch 'dev'