Fix use order
Fix use order…again
Fix use order
Merge branch 'master' into 1.1.0