3.0.5 release
Merge remote-tracking branch 'origin/master'