Rename :filename: option of code-block directive to :caption:
Merge upstream changes
Fix #1381 :rfc: and :pep: roles support custom link text
Backed out changeset 177fce4ba59c
Merged in tk0miya/sphinx (pull request #266)

Rename :filename: option of code-block directive to :caption:
Update CHANGES and documentation for PR#266.