This pull request should remain open until release/2.8 is merged with master

This pull request was created October 6, 2013 when the release/2.8 branch was
(re)created.