Upstream pull for 2.7.1-beta1
Upstream pull for 2013-09-10
Merge from upstream
Merge branch 'upstream'
Revert "Revert "Bug fix for AR Response with Filenames""

This reverts commit d81bbb0d228155d46f6b66d44bb08ad1d7392af2.