Merge branch 'release/5.0.5/master'
Some weak ass references.