Working towards 2.0.5
Merge remote-tracking branch 'origin/master'