Feature complete 1.0.5 release candidate.
Merge remote-tracking branch 'origin/master'