Preparing release 2.0.5
Merge branch 'master' into xf